Merge branch 'master' into staging
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 31 Jan 2014 11:21:55 +0000 (11:21 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 31 Jan 2014 11:21:55 +0000 (11:21 +0000)
commitfeee1ace547cf6247a358d082dd64fa762be2488
tree9c2e11bf0ff8d7e07fb9925ef81b705936b2fccd
parenta96bbe5fd79ea8ac6b40e90965f84aab839d3391
parenta731bb25c072004a7c073625eb6ef14cc9011c74
Merge branch 'master' into staging